Add some defsubst to enhance readability