(Angrylion) Refactor more for C89