Even more improvements. Yay for code reuse?