Moving things around to make everything more understandable