refactoring
cleaned everything up.