Clean code and comment