finished assignment 6 and did some refactoring