Moving more stuff for clarity