refactoring; cleaning up some emoticons