Start refactoring less for smaller footprint