Cleaned up a bit of the WOrm class