- cleanup and coding style