Some code clean + standards