Cleaned up the thing