cleaning up code and adding white back