Moved constructor to top
Simplification