[great-goose] Cleaned up the code and log messages