Moving conditional to new line for consistency