Slight modularization.