Commit and clean 4/6/14