Cleaned up, use shell style