Change StatusIndicator class name
Fix paths
Whitespace, change variables