Started code refactoring / clean up