Some clean up of code