Add some minor changes to the code layout