Minor formatting and bug fixing

Improved code readability
Fixed dependencies
Removed ‘gauged’ support