Changing some values to be fetched from method calls, other minor cleanup
Removing my email from github