Code cleanup, README edit