fixing typo and cleaning up...