Removed extra comments and used packages