Cleaned implementation of FolderStatus (#120)