Cleaned up usage