- Removed some disabled linter rules from code and update code to comply with those. - No logic was changed.