Merge RUN commands, remove unnecessary grep commands, remove redundancy.
#837
+87
−100