format and removed some dead code, or dead comments? lol