comments and small style changes