Refactoring
Renamed a function
Update comments
Remove stdout.write for quiet mode
Merge branch 'public' into develop