Cleaned up BerserkerBot code a bit more