Style fixes

constant in uppercase
fix spacing
constant parameters in function definition