Simplified some things and updated README