Input/Utils refactoring
Name refactoring
Added some docs, minor changes