cleaning up and organizing. almost there.