implemented more formatting enhancements
removed silly manual indentation