Remove constructor, and clarify helper method