Use Nullable
Use colon instead of at-sign
Indents
Add inBits param to toString
Clean up file kinds processing