Improved README, some code cleanup