improve indentation and readability