A lot of improvements on formatting and syntax best practices