Cleaning up new classes. Adding documentation