moved methods around for clarity
renamed methods for clarity
fixes 13