Cleaned up code.. renaming and refactoring methods
more refactoring