minor cleanup/stuffs