Minor code cleanup
Filling in manage code.