More refactorying and changing code