Modularized code even more.