Clean comments and structure code