removed redundant classes; commented code