Removed prints; Little code changes