Removing pointless code, focussing on what matters
Re-organising a bit