Cleaned up bot a bit