Code clean - work in progress
Merge branch 'cleanup' of github.com:openforis/collect into cleanup