cleaned up first two sections