Resolve Accumulating Linting Errors for Cleaner code base

There is need to resolve the accumulating linting errors for a cleaner codebase so as to help other users understand and work on the codes better and to avoid other bugs in future.