Comment/code cleanup