More refactoring/Clean up