Cleaned Up Codebase.