Just some comments, formatting and name changes