Clean code and remove cross