Clean-up
Layout improvement