starting to clean up code. Pushing ot ensure it still works before making anymore changes