My focus was only to remove NPE it will be improved : ]