Code Optimized + Package Name added

Done with following changes

1. Code optimized in lot of places for 
iterators replaced wih enhanced for loop
imports optimized

2. Alarm name description now shows package name
please check if you see this is a good place to show the package name

3. Synced my changes with you latest code in master