reorganize class (change access level modifiers)
remove horrible code
remove useless comments
remove garbage