Cleaned up constructor, updated README.md