Finish refactor
Fix citizenwatt.sh