Solved 158, minor refactor of some old ones