Refactoring; code revu - fixed; last-modified header checking