Added comments, removed unused modules