Simplifying things... (small refactor)