Some stylizing improvemnt