Merge pull request #43 from pof2/style-cleaup

Style cleaup
TX ack