Code cleanup :christmas_tree: