- Removed zf1 style code
 - Fixed class import