Fixed a type, small style changes