Updated codebase to make it more palatable