Enhanced formatting & fixed minor bugs