Fixed some idiomatic issues