Added checkstyle check
Removed problematic espresso
Applied Checkstyle's suggestions