Cleaned some spaghetti