Fixed minor quality issues