Refine style + make easier for users to modify