Removing unnecessary installation lines
Improving design