Cleaned CodeBase