Update code formatting, fix molly guard code