Rearranged method-arguments to reduce line-length below 150 chars