Reenstated "ant retrieve"
housekeeping
A little refactoring