Split up excessively long method