formatting cleaned up a bit