Cleaned code in Jar module
A bit of cleaning of Office module