Reorder methods based on memory use

Additional minor improvements