Finish code clean up