Broke down and Fixed?

Broke down a couple methods for readability
Possibly fixed a bug? I don't really get it.... bytes are weird...