minor style changes, continue cleaning for actual use