Code cleanup; added renamers & simple optimisation
Fixed some conflicts