Removed some unneeded const and some style fixes