PR for code review

Refer to this comment: https://github.com/PaulAlfred/AutomobileCatalogue/pull/1/files#r20490995
and apply to all others :bow: