Cleaned up Activity Diagrams