Added comments and cleaned up unneed code.
Cut out unused classes