Cleaned up some!