Did just a few cleanups. For example the containers were being templated
for a short float... -___- Be aware of copy-pasta