Best practices cleanup