[Improvement - LOW] Just more random improvements