clean up
clean up
commented out the mention notification in comments just for now.