Cleaned up installer