Added comments and cleared unused packages