CONN-152: Code cleanup and formatting