Fixes whitespace and missing nullop methods