Further tidying up
Starting on styling