- fix, cleanup and coding style