Clean up

Chained fadeInTime, removed sloppy stuff