Cleaned up status codes and such