Cosmetic changes: formatting and move streamCompact to own directory