Clean code
Clean again