formatting and nit-picky things