Cleaned up connector placement