further codegolfing