Changed package name, removed unused packages.
Removed useless statements and added comments.
Refactored some methods.