Removed unused argument, simplified method