Moving methods to more appropriate locations