It was sloppy and redundant to have it all like that.
This is a step in the right direction though.