[CHANGED] Added annotations to StyleTest and performed minor refactoring.