Cleaning up of code.