Made status function void and removed side-effects
Renamed some functions to something more sensible