refactor 2 FIX THIS SHIT
Merge pull request #49 from ynotLeft/refactoring

refactor 2 FIX THIS SHIT