Renaming, commenting, minor improvements