Modularize a little more