Fix: cs and code readability