refactor - remove unused methods, cleaner instantiation