Cleanup code a bit more to comply the WordPress standards.