Listened to the Linter (for the most part)