Make changes requested by @sikachu