clean source code and ready for reviewing