Cleaned up installation procedure