Some code cleanup, README additions