Feature/iteration 4 dev codepro

only line length audit left others gone! and not breaking any code!!!  xwen2