Cleaned up some artifacting