more code cleanup & constants
Fixes #2. No need to check vibrate mode for #1