Reorganized things again for better readibility