rearranging for readability + cleaning up unnecessary things