Cleaned up our magic values section