Fix some nitpicky style issues

jscs = picky