Cleaned up constructor mess