refactor: improved code quality in objects

Performed multiple actions to improve readability, reduce nesting,
and remove redundant code.

Author: gnikit