Little changes and optimisations