Fixed some style errors mentioned by Freek