Formatting and readability improvment