Cleaned up the usage