Removed redundant method definitions + Used keyword arguments to add context