Improved code quality by splitting up large methods