Re-organized Makefile.

Added better comments, improved readability, etc. Also improved docker image creation procedure.