second commit, cleaning up my mistakes