Cleaned up the Jasmine code organization