added more pretty printing, removed some commented out code