code cleanup

Ma, Oliviarequested to merge
olivia-connection into master

final cleanup on code comments, formats etc

Merge request reports