Little code Cleanup. Same version v1.55