Still refactoring...
Refactoring & cleanup
Well... Refactoring ...