Rea: General clean up