I'm not exactly sure what you had in mind, but I pushed some changes that might be sufficient.