Initial
Delete unused parameter, rename method