Code improvements added