Some refactoring.
Got 1 minute data going in.