Cleaner Code: Replaces each blocks to single lines & other updates