Standardized Project + Cleaned Up