Code refactoring/cleanup, README.