Added more signs and cleaned up array names