Also, that can be cleaned up a touch