cleanup/slight style adjustment