Cleaning up the placement stuff a little