refactoring, cleaning up
Cleaned up code, refactoring