Cleaned up some globals, and cleaned up message formatting