Adding default directory and removing some commented stuff