Comment and clean code