Clean code for version 2.0