made some aesthetic and code changes;