Some minor improvements but still sticking to the lazy and fill-in-the-blank architectural style/practice: