Class and method comments and some readability