minor style fixes
Forward propagation code sharing