Remove TODO
Remove unnecessary default constructor
Fix consumption of arguments