Cleanup + Minor Improvements