Refactored more code and ran it