Cleaning up #defines