Refactering for organized log