Little code organization changes