Cleaned up some icky constants