Move methods outside to reduce garbage collection

Move methods outside to reduce garbage collection #500