Cleaned up mostly