Merge random stuff done on server
Normalize indentation