edited with code standard