Fix indents & remove notes & reorder (PrefManager)