Updating some formatting to provide more dynamic code