Astyle targets and better cleanup for makefile. Some formatting.