Renamed some vars
Organise imports better