SLICE-8 CR fixes
SLICE-8 Refactoring and javadocing