Some lint/style improvements (thanks @eisenivan!)