Cleaned up sensor macros