cleaning up A LOT