re-organised method orders so more logical to read

Signed-off-by: Simon <sb542@sussex.ac.uk>