Clean code with comments and rename some classes.