Removed redundant super() and NPEcheck