#2: coding style fixes made.