Core: code gardening