Some cleaning + enhancement