Refactored the God class Line