Fixed some style, adhered to 80 char limit