Removed package annotations as requested by @samsonasik
Changed count() check as requested by @weierophinney