Code Cleanup extended upon. Sheetrock start