Dev Wade

checkstyle arrangement
and fix blank space bug