making code better, finalizing everything