fixed typo and cleanup