Removed comments, added some traceables