DRY up the codez
Merge shortcuts and notes
Delete legacy code