Minor code cleanup, comments