Removed redundant references/methods, added case