Feature/151 adhere to wordpress coding standards