Code cleanup + fixed minecarts not following rails