Use a better name for the classes
Remove double commented code
Move the user function to the new library based system