Optimise some methods