Updated docs and cleaned few methods