Optimized imports and added some JavaDoc to interfaces