cleaned up project a little