Fix should save memory
Small refactoring and updated javadoc
Small refactoring
Added notes for future use