Fixed consts
Style stuff
Style stuff