Cleaned up function quality to be more readable

and started computing decoders over time