cleaning up a bit more and adding loader