some refactoring
fixed: some assets taking too much to download in production (really, up to tens of seconds)