Problem 1 & 2 Cleanup