Review for WP & efficiency

Make minor code changes to improve efficiency and make sure no additional WP shortcuts/helpers can be used