Update comments. Change var-names. Cleanup