Some cleaning on the code.