Got rid of some inline WP properties