Cleanup function names and fix allways downloading modules