Code: Analysis fixes and formattings