Code and style cleaning