Code and test cleaning