refactored: comments, semicolons, stuff