Optimised variables. Removed redundant properties.