More updates on naming conventions, removing all kinds of trailing commas and general cleanup