removed log, added more comments