remove unnecessary const and order constructor inits