Prepare for next development iteration
Fix trailing spaces