diff --git a/GoldWars/GoldWars/Entities/Base.swift b/GoldWars/GoldWars/Entities/Base.swift
index 7fce8e0..e50a690 100644
--- a/GoldWars/GoldWars/Entities/Base.swift
+++ b/GoldWars/GoldWars/Entities/Base.swift
@@ -17,7 +17,7 @@ class Base: GKEntity {
     var changeOwnerShip: Bool
     var ownerShipPlayer: GKPlayer?
     
-    init(position: CGPoint, player: GKPlayer! = nil, team: Team! = nil) {
+    init(position: CGPoint, player: GKPlayer? = nil, team: Team? = nil) {
         self.unitCount = 0
         self.adjacencyList = [Base]()
         self.changeOwnerShip = false