Minor layout modifications and better practice