Removed package annotations and some coding style