Clean up
Add Amazon Linux support