Added slot, cleaned up a bit