Updated PR, removed .go redudancy.