format issues and comments correctly