Fix style, try to remove vars