Added hints; nicified