tweaking formatting
killing old/unused code