Cleanup indentation and remove old contructor