review and clean code