Code Pro fixes

Line length and final variables
kpmartin