Code cleanup: removed hardcoded colors to resources; and done some work on comment markup