fixed some small changes/organized better