Restructured Database & Refactored Code