Make code logically written