Cleans up constructor