Restructuring; Adding verbosity var, and cleaning up.