Adjust indentation
Don't use cl-function; simplify