Working on cleaning up my mistakes