Some code cleanup

Removed instance object references and replaced them with static object
references