Improves formating and comments