Clean/rearrange some methods.