Edited observatory.py, mostly cleanup