Cleanup: Remove unnecessary function
Cleanup: Set attributes when creating the object

This will ease understanding the code.