Comments added and Java7 style for t-w-r enforced