Minor changes and good practices