Cleaned up commands
Clean up