Added underscores and a few little changes with input and non-public methods