reverted this to @ for now; made many style changes to conform to style guide; delinted coffee sources
merged stylechanges