devcommand-12 Improve overall code quality