Output fixed
Clean up