Minor cleanups
Extracted methods