Cleaned up riot.py