commenting, cleanup and var names