Clean code for compilation