Fixed changes related to code cleanup