Updates for code clarity
More code cleanup for clarity