Code cleaning

Clean something, added const types