General cleaning of code.