More cleanup & reactive