fixed nothing, but organized better