Changed some references in favour of cleaner code