Small Optimisations

Adjusted some files to optimise them more.