Extracted code from various classes to clean overall app