cleanup and style