Refactored Go port
Removed Go port