quick cleanup and code  minimizing