Cleaned up 1 or 2 or 3 things