Cleaning up, fixing bugs (almost), coding style of labellist