cleaned up code hoarding a little