some commenting, renaming and deleteting