Refactoring/ fixed references