Minor Fixes
Clean up project