applied some good practices