Cleaned up massively