Made some fixes for readability