Reorganized on_add; PEP8