Styling tidyup as discussed