conciseness and correctness fix