Reverted to more readable way of things