Clean code
Debug