Utility methods cleanup