Cleaned up contents