Fixed some blatant style bugs/concerns