Changes for code cleanup and fixed review comments