switched to ERB methods
formatting changes and comment additions