README improvements and small code readability improvement.