Small clean-up for final version (continued as Eclipse project).