Fixed Loading Plugin

A bit of cleanup.