Code formatted more consistently