Bump either and tidy

Just some tidying.