Finish code refactor to contrib standards