Resolved String Storage issue

Minor refactor on all classes, tested class hooks and made appropriate
edits.