some code review & WP Coding