cleaned up some shizzle