Improved code readability and modified install script.