renamed some labels and cleaned up