Minor - Code style. Add Documentation and removed unused code - refs BT#8274