Restructures & Cleans up