Minor changes to code format