code beautification + fix of multiple labels