More minor code improvements and updated README