moved things around, cleaned up