Stylistic changes, still need to fix duplicate entry error