Cleaned up installation