Clean up code
Update diagnostics in print method
Fix bug in BUGS notation