Line up dependencies
Lineup dependencies for easy viewing and remove commented out code