Logging, code cleaning, readme update