Cleaned up constructor