clean up. separated maths and physics macros