Added String.contains, used better String.startsWith