remove unused methods, add gap between a line and a label, refactor