Changed naming in constructor, combined a few lines.