Tidying

Inlined some methods that ought to have been inlined.