Clean the constructor
Merge pull request #5 from asgoodasnu/WK-557

Clean the constructor