[master] Clean code