Cleanup and enhanced mean sample project