Make code clean