Removing Allman edits in master & reverting to vanilla DDA