Cleanup initialized member attributes

- Removed initialization from member variables and moved it to the
constructor