More cleaning of code.