Add typeplate, refine style