Cleaned annotation validation a little bit