Final Style Changes - Linter