code refacto / cleaning