ran astyle on source, and added beautify command to makefile (requires astyle 2.04)