General clean up (per review)