naming improvements, comments