MOB-237 code cleanup and comments