Boss state cleanup

Did some general cleanup to the code. Nothing important, but it's going to make working with the boss states a bit nicer.