Refactored some code, cleanups