Fixed formatting and node dependancies