Removed extra code and renamed things protoss style :)