Reformatted and imports optimized
Corrected travis target