formatted all entries to be compatible with jdk1.7