4 Commits (lint-fixes)