Other code clean