Some cleaning and some commenting