Cleaned up YARDoc