Original: At the war 's end in 1815 , he was again commissioned as the permanent Secretary of State , and left his position as Secretary of War .
Simplified: Monroe was Madison 's Secretary of State and Secretary of War .