style/cleanup