Renamed script to better follow the python conventions
Optimised the script a bit