Cleanup status code. For #109