comments and code cleanup
updated package dependencies